From eb37dccf5b7529173515f3204044386bb773d8ee Mon Sep 17 00:00:00 2001 From: Lutz Dube Date: Wed, 3 Nov 2010 17:23:42 +0000 Subject: [PATCH] tools: fix cpu_weight/cap loss (22000:4fc66044477d) Correction/Extension of changeset 22000:4fc66044477d "Values of cpu_weight and cpu_cap are lost after xend restart" Values of cpu_weight and cpu_cap taken from managed SXP file have to be converted from str to int. Signed-off-by: Lutz Dube Signed-off-by: Ian Jackson --- tools/python/xen/xend/XendConfig.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py index 3ec79d4a67..4181d6cf3c 100644 --- a/tools/python/xen/xend/XendConfig.py +++ b/tools/python/xen/xend/XendConfig.py @@ -689,9 +689,14 @@ class XendConfig(dict): if not cfg["vcpus_params"].has_key("weight"): cfg["vcpus_params"]["weight"] = \ int(sxp.child_value(sxp_cfg, "cpu_weight", 256)) + else: + cfg["vcpus_params"]["weight"] = int(cfg["vcpus_params"]["weight"]) + if not cfg["vcpus_params"].has_key("cap"): cfg["vcpus_params"]["cap"] = \ int(sxp.child_value(sxp_cfg, "cpu_cap", 0)) + else: + cfg["vcpus_params"]["cap"] = int(cfg["vcpus_params"]["cap"]) # Only extract options we know about. extract_keys = LEGACY_UNSUPPORTED_BY_XENAPI_CFG + \ -- 2.30.2